<html>
<head>
  <title>git命令整理复件</title>
  <basefont face="微软雅黑" size="2" />
  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
  <meta name="exporter-version" content="Evernote Windows/303788 (zh-CN, DDL); Windows/6.1.7601 Service Pack 1 (Win64);"/>
  <style>
    body, td {
      font-family: 微软雅黑;
      font-size: 10pt;
    }
  </style>
</head>
<body>
<a name="426"/>
<h1>git命令整理复件</h1>

<div>
<span><div style="box-sizing: border-box; margin: 0px; padding: 53px 0px 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: center; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); font-weight: 500;"><div><br/></div></div><div><br/></div><div><span style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><img src="git命令整理复件_files/Image.jpg" type="image/jpeg" style="cursor: default; height: auto;"/></span></div><div><span style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><img src="git命令整理复件_files/Image.png" type="image/png" style="cursor: default; height: auto;"/> 0     <img src="git命令整理复件_files/Image [1].png" type="image/png" style="cursor: default; height: auto;"/></span></div><div><span style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><span style="color: rgb(51, 51, 51); font-family: 'Microsoft YaHei', 'PT Sans', Arial, Helvetica, sans-serif; font-size: 15.2px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(224, 255, 224);">工作区（workspace）、暂存区（index）、本地仓库（local repository）<span style="font-size: 15px;">、</span>远程仓库（remote repository）</span></span></div><div><span style="font-family: 'Microsoft YaHei', 'PT Sans', Arial, Helvetica, sans-serif;"><span style="background-color: rgb(224, 255, 224);"><span style="color: rgb(51, 51, 51);"><br/></span></span></span></div><div><span style="font-family: 'Microsoft YaHei', 'PT Sans', Arial, Helvetica, sans-serif;"><span style="background-color: rgb(224, 255, 224);"><span style="color: rgb(51, 51, 51);">常用git命令：</span></span></span><a href="http://www.ruanyifeng.com/blog/2015/12/git-cheat-sheet.html?utm_source=tool.lu"></a><a href="http://www.ruanyifeng.com/blog/2015/12/git-cheat-sheet.html?utm_source=tool.lu">http://www.ruanyifeng.com/blog/2015/12/git-cheat-sheet.html?utm_source=tool.lu</a></div><div><br/></div><div><span style="font-size: 26px;"><span style="font-family: 'Microsoft Yahei', 'Helvetica Neue', Helvetica, Arial, Tahoma, sans-serif;"><span style="color: rgb(51, 51, 51);">19个Git日常实用技巧</span></span></span><a href="http://www.jointforce.com/jfperiodical/article/1522">http://www.jointforce.com/jfperiodical/article/1522</a>   <span style="color: rgb(255, 0, 0);">待看</span></div><div><span style="font-family: 'Microsoft YaHei', 'PT Sans', Arial, Helvetica, sans-serif;"><span style="background-color: rgb(224, 255, 224);"><span style="color: rgb(51, 51, 51);"><br/></span></span></span></div><hr/><div>   <span style="font-size: 14px;"><b>git add file1 file2 file3 ...</b>   //将工作区更改的内容添加到暂存区</span></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><b>   git branch  </b>             //查看本地分支</div><div style="font-weight: normal;"><b>   git branch 分支名  </b>  //创建本地分支</div><div style="font-weight: normal;"><b>   git branch -a  </b>        //查看本地分支和远程分支</div><div style="font-weight: normal;">   <b>git branch -r  </b>        //查看远程分支</div><div style="font-weight: normal;">   <b>git branch -d  分支名</b>  //删除本地分支，-D强制删除本地分支</div><div>   <b style="font-weight: normal;">git branch -r -d  远程分支名</b>  //删除远程分支：git branch -r -d origin/dev</div><hr/><div><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="font-size: 14px;">  <b> git checkout -b 本地分支名 远程库名/远程分支名</b>   //拉取远程分支到本地分支并切换到该分支：git checkout -b dev origin/dev</span></div><div style="font-weight: normal;"><span style="font-size: 14px;">  <b> git checkout -- 文件名</b>   //</span><span style="font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">可以丢弃工作区的修改，</span> <span style="font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">让这个文件回到最近一次<span style="font-size: 12px;">commit或add</span></span><span style="font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">时的状态</span></div><div style="font-weight: normal;"><span style="font-size: 14px;"><span style="background-color: rgb(255, 255, 255);">   <b>git checkout</b>  <b>分支名</b>   //切换分支     </span></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="font-size: 14px;"><span style="background-color: rgb(255, 255, 255);">   <b>git </b></span></span><span style="color: rgb(0, 0, 0); font-family: 'Microsoft YaHei', Verdana, sans-serif, SimSun; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);"><b>cherry-pick [commit_id]</b>  //</span> <span style="color: rgb(0, 0, 0); font-family: 'Microsoft YaHei', Verdana, sans-serif, SimSun; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">从不同的分支中捡出一个单独的commit，并把它和你当前的分支合并</span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="font-size: 14px;">   <b>git commit -m &quot;注释&quot;</b>   //将暂存区的改动提交到本地库</span></div><div style="font-weight: normal;"><span style="font-size: 14px;"><b>   git commit -a -m &quot;注释&quot;</b>   //跳过add，直接将<span style="color: rgb(227, 0, 0);">已跟踪过的</span>文件暂存起来一并提交</span></div><div style="font-weight: normal;"><span style="font-size: 14px;">   </span><span style="font-size: 14px;"><b>git commit --amend -m &quot;注释&quot;</b>   //将暂存区的改动和上次提交合并为一次提交，上次提交将不再存在，可用于</span><span style="font-size: 14px;">错误</span><span style="font-size: 14px;">提交的修复</span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="font-size: 14px;">   <b>git diff 文件名</b>   //比较当前和暂存区文件的差异</span></div><div style="font-weight: normal;"><span style="font-size: 14px;">   </span><span style="font-size: 14px;"><b>git diff --cached 文件名</b>   //比较暂存区和上次提交时文件差异</span></div><div style="font-weight: normal;"><div style="margin: 0px; padding: 0px; list-style: none none; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255);"><div><span style="color: rgb(68, 68, 68);"><span style="font-size: 14px;"><span style="font-family: 'Courier New', Courier, monospace;">  git diff master origin/master  //</span></span></span> <span style="color: rgb(68, 68, 68); font-family: Tahoma, Arial, Helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">本地分支和远程分支的差异</span></div></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="color: rgb(0, 0, 0); font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; white-space: nowrap; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);"><b>   git fetch origin 分支名  </b> //</span><span style="color: rgb(51, 51, 51);"><span style="font-size: 15.2px;">将远程的origin仓库的master分支更新到本地相关联的master分支上</span></span></div><div style="font-weight: normal;"><span style="font-size: 15.2px;"><span style="color: rgb(51, 51, 51);">   <b>git fetch --all</b>   //将所有远程拉取到本地仓库</span></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="color: rgb(51, 51, 51);"> </span>  <b>git init</b>   //将当前目录变成git管理的本地仓库</div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><code style="margin: 0px !important; padding: 0px !important; border: 0px !important; font-size: 14px; white-space: nowrap; border-top-left-radius: 0px !important; border-top-right-radius: 0px !important; border-bottom-right-radius: 0px !important; border-bottom-left-radius: 0px !important; bottom: auto !important; float: none !important; height: auto !important; left: auto !important; outline: 0px !important; overflow: visible !important; position: static !important; right: auto !important; text-align: left; top: auto !important; vertical-align: baseline !important; width: auto !important; box-sizing: content-box !important; font-weight: normal; font-style: normal; font-variant: normal; letter-spacing: normal; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-image: none !important;"><span style="font-family: 微软雅黑;"><b>   git log -p master..origin</b></span></code><code style="margin: 0px !important; padding: 0px !important; border: 0px !important; font-size: 14px; color: black !important; white-space: nowrap; border-top-left-radius: 0px !important; border-top-right-radius: 0px !important; border-bottom-right-radius: 0px !important; border-bottom-left-radius: 0px !important; bottom: auto !important; float: none !important; height: auto !important; left: auto !important; outline: 0px !important; overflow: visible !important; position: static !important; right: auto !important; text-align: left; top: auto !important; vertical-align: baseline !important; width: auto !important; box-sizing: content-box !important; font-weight: normal; font-style: normal; font-variant: normal; letter-spacing: normal; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-image: none !important; background-position: initial initial !important; background-repeat: initial initial !important;"><span style="font-family: 微软雅黑;"><b>/master</b>  //查看远程origin库的master分支与本地master分支的差别</span></code></div><div style="font-weight: normal;"><span style="font-size: 14px;">   <b>git log</b>    //显示从近到远的提交日志</span></div><div style="font-weight: normal;"><span style="font-size: 14px;">   <b>git log --pretty=oneline  </b> //</span><span style="font-size: 14px;">显示从近到远的简洁的提交日志</span></div><div style="font-weight: normal;"><code><span style="font-family: 微软雅黑;">   <b>git log --graph --pretty=oneline --abbrev-commit  </b> //查看分支合并图</span></code></div><div style="font-weight: normal;"><br/></div><div style="font-weight: normal;">   git log --all --author='leijun' --since=2016-01-20 --until=2016-07-06 --pretty=tformat: --numstat | gawk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf &quot;added lines: %s removed lines : %s total lines: %s\n&quot;,add,subs,loc }' -</div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><span style="color: rgb(51, 51, 51);">  </span> <code style="margin: 0px !important; padding: 0px !important; border: 0px !important; font-size: 14px; color: black !important; white-space: nowrap; border-top-left-radius: 0px !important; border-top-right-radius: 0px !important; border-bottom-right-radius: 0px !important; border-bottom-left-radius: 0px !important; bottom: auto !important; float: none !important; height: auto !important; left: auto !important; outline: 0px !important; overflow: visible !important; position: static !important; right: auto !important; text-align: left; top: auto !important; vertical-align: baseline !important; width: auto !important; box-sizing: content-box !important; font-weight: normal; font-style: normal; font-variant: normal; letter-spacing: normal; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-image: none !important; background-position: initial initial !important; background-repeat: initial initial !important;"><span style="font-family: 微软雅黑;"><b>git merge --no-ff -m &quot;注释&quot; 分支名(本地或远程)</b>   //将本地分支或远程分支合并到当前本地所在分支 <span style="color: rgb(255, 0, 0);">？？？merge可以将远程分支和本地其他任一分支进行合并吗，思考来源于图片3的写法</span></span></code></div><div style="font-weight: normal;"><a href="http://blog.csdn.net/a19881029/article/details/42245955">http://blog.csdn.net/a19881029/article/details/42245955</a></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;">   <b>git mergetool</b>    //当合并有冲突时，打开冲突解决工具</div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><b><span style="font-size: 14px;">   </span></b><b><span style="font-size: 14px;">git push</span> <span style="font-size: 14px;">origin</span></b> <span style="font-size: 14px;"><b>分支名</b>  //将本地分支推送到远程相同名的分支</span></div><div style="font-weight: normal;"><b><span style="font-size: 14px;">   </span></b><b><span style="font-size: 14px;">git push</span> <span style="font-size: 14px;">origin</span></b> <b>本地分支名:远程</b><span style="font-size: 14px;"><b>分支名</b>  //将本地分支推送到远程分支(本地分支名可与远程分支名不同)</span></div><div style="font-weight: normal;"><b><span style="font-size: 14px;">   git push --delete </span><span style="font-size: 14px;">origin</span></b><span style="font-size: 14px;"><b>分支名</b>  //强制删除远程origin库的分支</span></div><div><span style="font-size: 14px;"><span style="font-weight: normal; color: rgb(227, 0, 0);">   </span><b>git push origin :分支名</b>   //删除远程分支</span></div><div style="font-weight: normal;"><span style="font-size: 14px;"><b>   git push -u origin 分支名</b>   //将本地分支推送到远程origin库的分支上，如果远程库不存在，创建远程分支<span style="color: rgb(173, 0, 0);">，但是远程库分支名必须与本地分支名相同 ？？？</span></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;"><b>   git remote</b>   //显示远程库信息</div><div style="font-weight: normal;">   <b>git remote -v</b> <span style="color: rgb(0, 128, 128);"> </span>//显示远程库的详细信息</div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="font-weight: normal;">   <b>git reset --hard 版本号</b>  //将当前版本回退到任一版本，HEAD表示当前版本，HEAD^表示上一个版本，HEAD~100表示从0开始第100个版本</div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div><span style="font-size: 14px;">   <b>git reflog</b>  //</span> <span style="font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; display: inline !important; float: none; background-color: rgb(255, 255, 255);">查看所有分支的所有操作记录</span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div><span style="font-size: 14px;"><span style="background-color: rgb(255, 255, 255);">   <b>git revert 版本号</b>  //撤销某次提交</span></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div><span style="font-size: 14px;"><span style="background-color: rgb(255, 255, 255);"><span style="color: rgb(69, 69, 69);"> </span>  <b>git rm</b>   //相当于删除文件后再add</span></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div><span style="font-size: 14px;"><b>   git stash</b>  //备份工作现场</span></div><div><span style="font-size: 14px;"><b>   git stash list</b> //查看所有的备份</span></div><div><span style="font-size: 14px;"><b>   git stash apply</b>  //恢复备份但不删除备份，例：git stash apply stash@{0} 恢复第一个备份</span></div><div><span style="font-size: 14px;"><b>   git stash pop</b>   //恢复备份同时删除备份</span></div><div><span style="font-size: 14px;">   <b>git stash clear</b> //清除所有备份</span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div><p style="margin: 0px 0px 15pt; padding: 0px; color: rgb(0, 0, 0); font-family: 'Microsoft YaHei', Verdana, sans-serif, SimSun; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255);"><strong style="margin: 0px; padding: 0px;">每隔X秒运行一次git pull</strong></p><p style="margin: 0px 0px 15pt; padding: 0px; color: rgb(0, 0, 0); font-family: 'Microsoft YaHei', Verdana, sans-serif, SimSun; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255);">通常，合并冲突出现的原因在于你正在工作的本地仓库不再反映远程仓库的当前状态。这正是我们为什么每天早晨要首先执行一次git pull的缘故。此外，你还可以在后台通过脚本（或是使用GNU Screen）每隔X秒调用一次git pull：</p><div style="margin: 10px 0px; padding: 5px; font-size: 9pt; font-family: 'Courier New', Arial; border-width: 1px 1px 1px 5px; border-style: solid; border-color: rgb(221, 221, 221) rgb(221, 221, 221) rgb(221, 221, 221) rgb(108, 226, 108); color: rgb(0, 0, 0); font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px; background: rgb(246, 246, 246);">$ screen<br/>
$ for((i=1;i&lt;=10000;i+=1)); do sleep X &amp;&amp; git pull; done<br/></div></div><div><span style="font-size: 14px;"><br/></span></div></div><hr/><div style="margin: 0px; padding: 0px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; text-align: left; text-indent: 0px; text-transform: none; widows: 1; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div>git撤销merge</div><div><a href="http://hanhan2611.blog.163.com/blog/static/2075771392014428102714312/">http://hanhan2611.blog.163.com/blog/static/2075771392014428102714312/</a></div><div><span style="font-size: 14px;"><br/></span></div><div><span style="font-size: 14px;">读懂diff: </span><a href="http://www.ruanyifeng.com/blog/2012/08/how_to_read_diff.html">http://www.ruanyifeng.com/blog/2012/08/how_to_read_diff.html</a></div></div></div></div></div></div></div><div style="font-weight: normal;"><span style="font-size: 14px;"><span style="font-family: Consolas, 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;"><br/></span></span></div><div style="font-weight: normal;"><span style="color: rgb(227, 0, 0);"><span style="font-size: 14px;"><span style="font-family: Consolas, 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;">为什么手动修改远程库中的文件后，使用git status仍显示是clean的？ 没有fetch</span></span></span></div></div></span>
</div></body></html> 